Micron Document
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
| SparkN0de-git | SparkN0de |
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------

Node / ReticulumProjects / Sideband.git / commits / f3b0c71


Commit f3b0c71c7b4673f5183ab323d23bcd0ecbf3f1b2

󰉖 Browse tree at this commit

Parents : 2fe1527
Author : Mark Qvist <mark@unsigned.io>
Date : 2025-11-03T14:25:41+01:00

Added Weave interface to connectivity settings

Changes

2 files changed, 60 insertions(+), 0 deletions(-)

M sbapp/main.py +22
M sbapp/ui/layouts.py +38

Diff

diff --git a/sbapp/main.py b/sbapp/main.py
index 5decc71d..66de30da 100644
--- a/sbapp/main.py
+++ b/sbapp/main.py
@@ -3640,6 +3640,7 @@ class SidebandApp(MDApp):
self.widget_hide(self.connectivity_screen.ids.connectivity_enable_transport)
self.widget_hide(self.connectivity_screen.ids.connectivity_serial_label)
self.widget_hide(self.connectivity_screen.ids.connectivity_use_serial)
+ self.widget_hide(self.connectivity_screen.ids.connectivity_use_weave)
self.widget_hide(self.connectivity_screen.ids.connectivity_serial_fields)
self.widget_hide(self.connectivity_screen.ids.connectivity_share_instance)
self.widget_hide(self.connectivity_screen.ids.connectivity_shared_access)
@@ -3679,6 +3680,10 @@ class SidebandApp(MDApp):
# self.widget_hide(self.connectivity_screen.ids.connectivity_serial_fields, collapse)
pass
+ def con_collapse_weave(collapse=True):
+ # self.widget_hide(self.connectivity_screen.ids.connectivity_serial_fields, collapse)
+ pass
+
def con_collapse_transport(collapse=True):
# self.widget_hide(self.connectivity_screen.ids.connectivity_transport_fields, collapse)
pass
@@ -3707,6 +3712,10 @@ class SidebandApp(MDApp):
self.sideband.config["connect_serial_ifac_netname"] = self.connectivity_screen.ids.connectivity_serial_ifac_netname.text
self.sideband.config["connect_serial_ifac_passphrase"] = self.connectivity_screen.ids.connectivity_serial_ifac_passphrase.text
+ self.sideband.config["connect_weave"] = self.connectivity_screen.ids.connectivity_use_weave.active
+ self.sideband.config["connect_weave_ifac_netname"] = self.connectivity_screen.ids.connectivity_weave_ifac_netname.text
+ self.sideband.config["connect_weave_ifac_passphrase"] = self.connectivity_screen.ids.connectivity_weave_ifac_passphrase.text
+
self.sideband.config["connect_modem"] = self.connectivity_screen.ids.connectivity_use_modem.active
self.sideband.config["connect_modem_ifac_netname"] = self.connectivity_screen.ids.connectivity_modem_ifac_netname.text
self.sideband.config["connect_modem_ifac_passphrase"] = self.connectivity_screen.ids.connectivity_modem_ifac_passphrase.text
@@ -3724,6 +3733,7 @@ class SidebandApp(MDApp):
con_collapse_rnode(collapse=not self.connectivity_screen.ids.connectivity_use_rnode.active)
con_collapse_modem(collapse=not self.connectivity_screen.ids.connectivity_use_modem.active)
con_collapse_serial(collapse=not self.connectivity_screen.ids.connectivity_use_serial.active)
+ con_collapse_weave(collapse=not self.connectivity_screen.ids.connectivity_use_weave.active)
con_collapse_transport(collapse=not self.sideband.config["connect_transport"])
self.sideband.save_configuration()
@@ -3749,13 +3759,16 @@ class SidebandApp(MDApp):
self.connectivity_screen.ids.connectivity_use_rnode.unbind(active=serial_connectivity_save)
self.connectivity_screen.ids.connectivity_use_modem.unbind(active=serial_connectivity_save)
self.connectivity_screen.ids.connectivity_use_serial.unbind(active=serial_connectivity_save)
+ self.connectivity_screen.ids.connectivity_use_weave.unbind(active=serial_connectivity_save)
self.connectivity_screen.ids.connectivity_use_rnode.active = False
self.connectivity_screen.ids.connectivity_use_modem.active = False
self.connectivity_screen.ids.connectivity_use_serial.active = False
+ self.connectivity_screen.ids.connectivity_use_weave.active = False
sender.active = True
self.connectivity_screen.ids.connectivity_use_rnode.bind(active=serial_connectivity_save)
self.connectivity_screen.ids.connectivity_use_modem.bind(active=serial_connectivity_save)
self.connectivity_screen.ids.connectivity_use_serial.bind(active=serial_connectivity_save)
+ self.connectivity_screen.ids.connectivity_use_weave.bind(active=serial_connectivity_save)
save_connectivity(sender, event)
def focus_save(sender=None, event=None):
@@ -3840,6 +3853,11 @@ class SidebandApp(MDApp):
self.connectivity_screen.ids.connectivity_serial_ifac_netname.text = self.sideband.config["connect_serial_ifac_netname"]
self.connectivity_screen.ids.connectivity_serial_ifac_passphrase.text = self.sideband.config["connect_serial_ifac_passphrase"]
+ self.connectivity_screen.ids.connectivity_use_weave.active = self.sideband.config["connect_weave"]
+ con_collapse_weave(collapse=not self.connectivity_screen.ids.connectivity_use_weave.active)
+ self.connectivity_screen.ids.connectivity_weave_ifac_netname.text = self.sideband.config["connect_weave_ifac_netname"]
+ self.connectivity_screen.ids.connectivity_weave_ifac_passphrase.text = self.sideband.config["connect_weave_ifac_passphrase"]
+
self.connectivity_screen.ids.connectivity_enable_transport.active = self.sideband.config["connect_transport"]
con_collapse_transport(collapse=not self.sideband.config["connect_transport"])
self.connectivity_screen.ids.connectivity_enable_transport.bind(active=save_connectivity)
@@ -3882,6 +3900,10 @@ class SidebandApp(MDApp):
self.connectivity_screen.ids.connectivity_serial_ifac_netname.bind(focus=focus_save)
self.connectivity_screen.ids.connectivity_serial_ifac_passphrase.bind(focus=focus_save)
+ self.connectivity_screen.ids.connectivity_use_weave.bind(active=serial_connectivity_save)
+ self.connectivity_screen.ids.connectivity_weave_ifac_netname.bind(focus=focus_save)
+ self.connectivity_screen.ids.connectivity_weave_ifac_passphrase.bind(focus=focus_save)
+
self.connectivity_screen.ids.connectivity_local_ifmode.bind(focus=ifmode_validate)
self.connectivity_screen.ids.connectivity_tcp_ifmode.bind(focus=ifmode_validate)
self.connectivity_screen.ids.connectivity_i2p_ifmode.bind(focus=ifmode_validate)

diff --git a/sbapp/ui/layouts.py b/sbapp/ui/layouts.py
index 1b14ebbb..07557dab 100644
--- a/sbapp/ui/layouts.py
+++ b/sbapp/ui/layouts.py
@@ -626,6 +626,44 @@ MDScreen:
font_size: dp(24)
+ MDBoxLayout:
+ orientation: "horizontal"
+ padding: [0,0,dp(24),0]
+ size_hint_y: None
+ height: dp(24)
+
+ MDLabel:
+ id: connectivity_weave_label
+ text: "Connect via Weave"
+ font_style: "H6"
+ disabled: False
+
+ MDSwitch:
+ id: connectivity_use_weave
+ active: False
+ pos_hint: {"center_y": 0.3}
+ disabled: False
+
+ MDBoxLayout:
+ id: connectivity_weave_fields
+ orientation: "vertical"
+ size_hint_y: None
+ height: self.minimum_height
+ padding: [0, 0, 0, dp(32)]
+
+ MDTextField:
+ id: connectivity_weave_ifac_netname
+ hint_text: "Optional IFAC network name"
+ text: ""
+ font_size: dp(24)
+
+ MDTextField:
+ id: connectivity_weave_ifac_passphrase
+ hint_text: "Optional IFAC passphrase"
+ text: ""
+ font_size: dp(24)
+
+
# MDBoxLayout:
# orientation: "horizontal"
# padding: [0,0,dp(24),0]


──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────